Merge pull request #11 from jcalvinowens/Dev

Dev
Merge pull request #12 from jcalvinowens/Dev

css changes
error message clean up
Merge branch 'Dev' for Iteration 1 Testing
Merge pull request #14 from jcalvinowens/Dev

login page ios
Merge branch 'master' into Dev