Merge branch 'master' of https://github.com/piotut/MoneyApp

Conflicts:
	project/money/static/money/css/bootstrap.min.css
	project/money/static/money/css/cover.css
	project/money/templates/money/base.html
	project/money/templates/money/index.html
	project/money/templates/money/login.html
	project/money/templates/money/register.html
	project/money/views.py
Merge branch 'master' of https://github.com/piotut/MoneyApp