Merge pull request #33 from jpecht/master

reorganization
work on zoom function
Merge remote branch 'origin/master'
added non-restrictive cross-domain policy
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js