dynamic forms yay
Fixed merge conflict, it was just one link edit, but a few of the branches edited the same thing.
Conflicts:
	app/views/layout.erb
fixed merge conflict
Merge branch 'master' of https://github.com/cugamer/survey_kitten
cleaned up layout