added more things from class
Merge branch 'master' of https://github.com/mmdehart/MobileApps into mads
for some reason i just created a different branch