Apr 13

modified css
Merge branch 'master' of https://github.com/qiaohe/repaymentApp

Conflicts:
	src/main/webapp/index.html
	src/main/webapp/resources/js/app.js