last commit before redesign
Merge branch 'master' of https://github.com/blyons333/britneylyons

	renamed:    AthensPic.JPG -> AthensPic.jpg
Pulled from github