Added new Options class for creating customized fireworks
Merge branch 'master' of https://github.com/JS2014TeamDaegon/JSApp
Rearranged containers on screen, making options container placed left from the fireworks preview
Merge branch 'master' of https://github.com/JS2014TeamDaegon/JSApp

Conflicts:
	JSApp/index.html
	JSApp/js/fireworks-js/main.js
	JSApp/js/fireworks-js/release/fireworks-js.min.js