yes
static assets served
master broken
fix branch working
Merge branch 'fix-json'

Conflicts:
	Gemfile
font awesome fixe
oops
travis.yml file added