Merge branch 'masterj' of https://github.com/CreativeHole/timLife
data
viw
Merge branch 'masterj' of https://github.com/CreativeHole/timLife
writing data in firebase full
changes
Merge branch 'master' of https://github.com/CreativeHole/timLife into masterj

Conflicts:
	css/elements.css
	css/frontpage.css
	css/mixins.css
	css/user.css
	js/views/login.html
	js/views/user.html
View login and register
View register and view login