additions
additions and Merge branch 'master' of github.com:bartschelfhout/hackathon

Conflicts:
	global.js