first working dynamic div sizing
Merge branch 'master' of https://github.com/dp6ai/flapjack

Conflicts:
	db/schema.rb