Making the login page
wq
Merge branch 'master' of https://github.com/cottalucas/iPromise

Conflicts:
	iPromise/www/css/index/.ignore/index_main.less
	iPromise/www/css/index/index_main.less
	iPromise/www/css/index_main.less.css
	iPromise/www/index.html