working on canvas.html, need to save img to server
commiting to push.
Merge remote-tracking branch 'origin/andrew' into temp2
recovered canvas.html
recovered home.html
removed/consolidated recovered files, dropped dawson/develop branches locally
META tag fix in base.html for scaling on mobile
Changed port to 8080, part of DNS changing and getting pig.io to work
fixed port listening merge conflict
changed map height
Style Sheet @ base.html -Matt
Managed to get map loading correctingly. Now having a style sheet order problem with the buttons. The map doesn't like to be resized (or have multiple css stylings applied to it).
map is now in an iframe. still having dns errors and css problems, needs multiple refreshes
Map sized properly, pulling facebook pic, working on plotting markers.
Image selecting complete. Working on image popup.
Graph popup complete. Working on saving image to FB.
Updated profile page. Fixed loading FB data when nav to profile.
Small chages ot base.html that conflicted with matt's branch. Trying to get up to date
merged andrew with dawson on andrew
Removed old images and added mockup images in /site/files/img