college-flow changes

added gitignore for my ide, changing some other stuff in the index,
mostly working on college-flow
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/assets/js/app.js