install jasmine gem
Update design styles
Merge branch 'master' of github.com:llxff/tt

Conflicts:
	Gemfile