Merge branch 'master' of https://github.com/paveethorn/MyRecipeBox

Conflicts:
	db.php
Merge branch 'master' of https://github.com/paveethorn/MyRecipeBox

Conflicts:
	db.php
Merge branch 'master' of https://github.com/paveethorn/MyRecipeBox

Conflicts:
	db.php
Merge branch 'master' of https://github.com/paveethorn/MyRecipeBox

Conflicts:
	db.php