changes
Merge branch 'master' of https://github.com/wnajar/finalproject

Conflicts:
	application/views/home/index.blade.php