update data
merged with new version
Merge branch 'master' of https://github.com/BeerPoldet/gitTest

Conflicts:
	app/views/index.html