added welcome controller tests, passed
added box into view - not ready for deployment
Merge pull request #34 from amelialaundy/welcome_controller_tests

added welcome controller tests, passed
pulling changes from master
Merge pull request #35 from amelialaundy/dev_branch

Dev branch
creating a new ability controller from player controller
adding an addpseed ability function
attempting to remove event listener on elft arrow key up
adding console logs to debug losing lat functionality when moving, adding parfloat to original player positions
trying to call ability controller to disable event listener on left arrow keyup
got keydown to override key up when pressing f key
removing bind(this) from the call to moveplayermarker in player controller
removing console logs from ability controller
removing console logs from player controller
removing excess parseFloat methods
tidying up view js
attempting to fix breaking tests of jqeury.on method
Update controller.js
Merge pull request #36 from amelialaundy/adding_abilities

Adding abilities
Got ability box to appear in view, when player touches it it disappears