(ignore)
Merge branch 'master' of https://github.com/thomasverleye/GAP

Conflicts:
	src/js-dev/main.js
	src/js/main.js