I don't even know any more. Special attacks? Magic? Both?
Merge branch 'master' of https://github.com/ComicsShawn/wintheinternet

Conflicts:
	js/loadpanel.js