this is the design you're getting
Merge branch 'feature/user_spa' into develop
Merge branch 'master' into feature/integrate_design_with_basic_points

Conflicts:
	app/controllers/farms_controller.rb
	config/routes.rb
font
can add lines
can add lines using getCenter() for dev/debugging
can submit
renderSubmit and renderFinish buttons
we're not big idiots
nifty hack
Merge branch 'feature/integrate_design_with_basic_points' into develop
Merge pull request #2 from onlyjsmith/develop

Develop