-m "added headers to .js and .css/scss"
Merge branch 'master' of https://github.com/afahim/warioware
-m "fixed header conflicts"
Conflicts:
	js/game1.js
	js/game2.js
	js/min/game2.min.js