stashing
Merge branch 'master' of https://github.com/reastland/CSCI5828PhotoApp.git
Merge branch 'master' of https://github.com/reastland/CSCI5828PhotoApp
whatever