.idea added to .gitignore
Merge pull request #1 from zoeames/mike

Mike - initial style (nav bar)
Create user added
Register and login working
user routes
user.sh
removed .idea... i hope
.idea removed
merge conflict
Merge branch 'matt' into zoe

Conflicts:
	server/controllers/user.js
	server/models/user.js
	server/routes/routes.js
user models merged, login, register, routes
Merge branch 'zoe'
slide show
Merge branch 'master' of https://github.com/zoeames/VIchan into mike
grunt warning fixed
Merge branch 'master' of https://github.com/zoeames/VIchan into mike
slide-showCss