Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into louis
changed project model
Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into louis
Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into louis
change to projects table seeder
made projects index
Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into louis
some changes
Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into louis
Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into louis
Louis's changes
Merge pull request #21 from louis-drew-josee/louis

Louis
Merge branch 'master' of github.com:louis-drew-josee/hidden-sun into josee

Conflicts:
	app/controllers/ProjectsController.php
	app/routes.php
	app/views/partials/nav.blade.php