Merge remote-tracking branch 'origin/McKee'

Conflicts:
	Maven.userprefs
Merge branch 'master' of https://github.com/Shadowh4wk/Maven

Conflicts:
	Maven.userprefs
Fixed various scaling issues for readability
k
Unknown
Merging to Master
asdf
a
ab
Fixed health bar scalability as well as fixed a weapon damage bug
Updated Abilities.js

Updated Abilities.js script so all abilities will now display and
updated. Pistols will now display and update with the proper stats per
type.
Added a Back Button to allow users to return to main page without having
to hit P and then P again.
This is my update title
This is my update title
Weird issues occurred in the last commit to WeaponList.js.. Fixed.
Ignore
Prototype of enemy health complete