master new
implements data
changes
master
master
master
changes
changes
master
Merge branch 'master' of https://github.com/CreativeHole/timLife into masterj

Conflicts:
	css/elements.css
	css/mixins.css
	css/style.css
	css/user.css
	css/utilities.css
	index.html
	js/actions/routes.js
	js/views/login.html
	js/views/user.html
	less/elements.less
	less/style.less
	less/user.less
	less/utilities.less
View user and inventory