map test
Merge remote-tracking branch 'origin/master'
take a picture in 480x480 format
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html