update
Merge branch 'dev' of https://github.com/zoeames/VIchan
user db script added, some route scripts added
Merge branch 'master' of https://github.com/zoeames/VIchan
navbar
Merge pull request #1 from zoeames/mike

Mike - initial style (nav bar)
user routes
.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'
grunt warning fixed
Message send, showAll and showOne added