initial commit
working on templates
completed first layout
Merge branch 'layout' into staging
added flickrjs file
resolved merge issues
removed map template
working on merge
fixing merging conflict attempt: continued
remove map template; remove googleAPI's example text in mapAPI
minor layout change w/in 'our location' div
resize map; position within div