more inline stuff
more things
Merge branch 'master' of github.com:joshbuddy/slick

Conflicts:
	public/javascripts/client.min.js