succeeding
Merge branch 'master' of https://github.com/azpoliak/spotAdTrapHackathon

Conflicts:
	example-template/index.html