"New Stuff"
"Fix"
"Log"
Merge branch 'master' of https://github.com/mrfoh/amoniproeject

Conflicts:
	app/views/pages/home.blade.php