updating pre-merge
Merge branch 'master' of https://github.com/lovettlovett/10stagram
refactoring to remove lots and lots of while loops – replaced with enumerators