'set ui-routes'
'set ui-routes'
Merge remote-tracking branch 'origin/Dennis' into Dennis
added a variable.less, and edited indention on client/index.js
initial index.js content
fix grunt style errors
Merge remote-tracking branch 'origin/dev' into dev
playing with ui-router
merged conflict
resolved merge conflics b/w login and dev
added routes and tostr config
resolved conflicts with the server side
make server hapi
Merge branch 'dev' of https://github.com/shrutijalewar/DBtl into dev

Conflicts:
	server/routes/config/users/post_login.js
delete extra index.js
clean up index.js
nav and splash img up
added decorative font confirmed as decently responsive
server auth
added responsive images to home