sd
Merge branch 'master' of https://github.com/manningjr/CSCI-3950-Mobile-Applications

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/manningjr/CSCI-3950-Mobile-Applications