Knockback! :D
Knockback! :D
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
edited knockback,
got timer working how i wanted it to,
(not connected to anything yet)
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	js/main.js
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
changed xp
added score function
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
changed xp
added score function