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

Conflicts:
	project/money/templates/money/index.html
	project/money/templates/money/login.html
	project/money/templates/money/register.html
Merge branch 'master' of https://github.com/piotut/MoneyApp

Conflicts:
	project/money/templates/money/index.html
	project/money/templates/money/login.html