Random crap trying to figure out how to do attacks and movement correctly
Rename gamePanel.java to GamePanel.java
Fixed movement
Merge remote-tracking branch 'origin/Nicholas' into Nicholas
Merge to master