resize map; position within div
add address & contact info to html
gulped
[hopefully] fixed merging conflicts
Merge branch 'staging' of github.com:locomotes/restaurant into layout
flickr photo feed is live