<commit_before># Change Log 

============================================
Members: Matthew, Dennis, Injo, Haram, Lydia

2016-10-06 23:40 - Lydia
-Modified page style for admin, recipe, product and material views

2016-10-06 22:25 - Dennis
-Admin controller to allow renaming instead of changing quantity
-fixed Materials model bracket

2016-10-06 20:33 - Dennis
-Added Transaction Model
-Readded Product MVC

2016-10-06 17:58 - Matthew
-Added Recipes Model
-Added Recipe List View
-Added Recipe Single View
-Added Recipe Controller

2016-10-06 17:40 - Haram
-Added Material model
-Added Material controller
-Added simple list view for material

2016-10-06 17:25 - Lydia
-Added dashboard view
-Added modify page style for stock 

2016-10-06 17:11 - Dennis
-Added admin controller 
-Added admin view 
<commit_msg>For solving conflict<commit_after># Change Log 

============================================
Members: Matthew, Dennis, Injo, Haram, Lydia

2016-10-06 22:25 - Dennis
-Admin controller to allow renaming instead of changing quantity
-fixed Materials model bracket

2016-10-06 20:33 - Dennis
-Added Transaction Model
-Readded Product MVC

2016-10-06 17:58 - Matthew
-Added Recipes Model
-Added Recipe List View
-Added Recipe Single View
-Added Recipe Controller

2016-10-06 17:40 - Haram
-Added Material model
-Added Material controller
-Added simple list view for material

2016-10-06 17:25 - Lydia
-Added dashboard view
-Added modify page style for stock 

2016-10-06 17:11 - Dennis
-Added admin controller 
-Added admin view 

{'fraction_non_alphanumeric': 0.12418725617685306, 'fraction_numerical': 0.10143042912873862, 'mean_word_length': 4.1644295302013425, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6557254', 'n_tokens_mistral': 559, 'n_tokens_neox': 434, 'n_words': 189}