added fxs
Merge branch 'master' of https://github.com/bushibytes/jamation

Conflicts:
	public/javascripts/jam.js