just some controller stuff
Merge branch 'master' of https://github.com/elanas/Shuq
login view controller merge issues
some dope commitals
merges