initial commit
begin map setup
removed dist/ from gitignore; minor styling change in scss
add mapAPI file to scripts dir
begin work on map object constructor
working on templates
add map parameters
completed first layout
Merge branch 'layout' into staging
added initialize; map is displaying properly! :-)
change maptypeid to ROADMAP
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
added header image and formatted
gulped