Completed Layout of the login/create account screen
Merge branch 'master' of https://github.com/Jeffsul/RiskApp

Conflicts:
	gen/com/jeffsul/riskapp/R.java
	res/values/strings.xml