merge
Merge branch 'master' of github.com:ensmp/gala2013

Conflicts:
	index.html