gold
Merge branch 'master' of https://github.com/Vanley/turbo-adventure

Conflicts:
	AngularJS/index.html