changed some settings
Merge branch 'master' of https://github.com/Macalester-Worldwide/MacWorld
added formatted address field to the models
commit before merge
Merge branch 'master' of https://github.com/Macalester-Worldwide/MacWorld
Merge branch 'master' of https://github.com/Macalester-Worldwide/MacWorld
started with a kickass homepage