updates from info 152 class
Merge branch 'master' of https://github.com/chelmyers/The-Apt-App

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/chelmyers/The-Apt-App