commit changes
Merge branch 'master' of github.com:kshmir/ss-2013

Conflicts:
	app/assets/javascripts/anim.js