update
Merge branch 'dev' of https://github.com/zoeames/VIchan
.idea added to .gitignore
Merge branch 'master' of https://github.com/zoeames/VIchan
navbar
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
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