what is this
Merge branch 'master' of https://github.com/gopatrik/twinkle
Merge branch 'master' of https://github.com/gopatrik/twinkle
Splash style
Merge branch 'master' of https://github.com/gopatrik/twinkle

Conflicts:
	app.jade
cards
Merge branch 'master' of https://github.com/gopatrik/twinkle