ugh merge hell to come
Merge branch 'mybranch'

Conflicts:
	jam_template/js/Main.js
blah