removing transitions that are uneeded
Merge branch 'master' of https://github.com/eddiemachado/bones

Conflicts:
	library/css/style.css