change
...
Merge branch 'master' of https://github.com/hsin421/Twister
changes to layout
Merge branch 'master' of https://github.com/hsin421/Twister

Conflicts:
	Twister/views/layout.erb