Merge branch 'master' into brad
Merge branch 'master' into brad
carousel navigation tweaks
Fixed button gradients and transitions
Merge branch 'brad'

Conflicts:
	atoms.html