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
Changed port to 8080, part of DNS changing and getting pig.io to work
fixed port listening merge conflict