Fixed scrolling texts for conditions to be persistent and more informative
Bug fixes and make colors in condition scrolling text work
Added wall skill, pretty cool
Resync upstream while keeping my changes
Fixed couple namespace issues
Added bunch of skills and rebalanced some of the older skills. Added red transparent box around skill icons to indicate lack of energy to cast.
Added arrows to indicate where player is if they go off screen on top
Fixed text
Added selection box to menu screens.  Move selection box with arrow keys / directional pad, select with enter key / start button, go back one page with escape key / select button.
Fine tuning of selection box for menu screens.  Use gamepad jump button to confirm entry into new menu and gamepad skill1 button to cancel / go back one menu.  Cannot use skill1 button to back out from main menu, must instead confirm on exit button.  Selection works on options page also - use up/down and left/right to change sound and music settings.  Don't need to confirm.  I implemented this menu and selection box stuff with some pretty ugly, long code, but I guess whatever works at this point.
Merge branch 'master' of https://github.com/mk13/cs113_game into mk13-master
Merge branch 'mk13-master'