#
Merge branch 'master' of https://github.com/pavelpipus/keeper

Conflicts:
	assets/css/style.css
	assets/css/style.scss
	index.html
	index.jade