User stuff
gitignore edit
Merge branch 'master' of https://github.com/ralampay/inclusiveinnovation.git

Conflicts:
	app/views/shared/_header.html.erb
merged slideshow