version 2!!
Merge branch 'master' of https://github.com/fdograph/ninjaSlider

Conflicts:
	ninjaSlider.sublime-project
	ninjaSlider.sublime-workspace
	www/js/ninjaSlider.js
version 2.0!!