pre merge
merge nick
start login
start Registration view
add text to registration view
debugging
merge
merge
Merge branch 'master' of https://github.com/nickbiaogame/GymBuddy
merge