Modified from previous pull, commiting before pull from head
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront