nothing
Merge branch 'develop' of https://github.com/jacekgdudek/smashjs2 into develop

Conflicts:
	web/js/eventHandler.js
	web/js/main.js
added mazeScene.js
Merging Jacek and Jakub's changes (remote-tracking branch 'origin/develop') into structureUpdate
* Removed vim swap files
* Updated the audioManager to use version 0.3.0 of preload.js
* Big Change: Updated the structure definition files so they are split into scenes
* Updated the preloader to parse the images in the new, more modular structure
* Refactored some of the graphics drawing function to be 10X more readable
* Added a scene with a video example (scenes/videoScene.js and structures/videoSceneStructure.js)
Cleaned up temporary files
Cleaned up temporary files
* Improved the video scene example
* Added video ended callback function
* A few small changes required to resolve conflicts
* Updated the scene and loader to deal with versioning issues
nothing
test
Merge branch 'develop' of https://github.com/jacekgdudek/smashjs2 into develop