no message
Merge branch 'master' of https://github.com/5i-2014-01-ARobin/wifi-walk-5i

Conflicts:
	fotos.html