reworking frontend
css float
css colon+wrapper
user sign up attempted fix 1
Revert "user sign up attempted fix 1"

This reverts commit 34d2853f45e11ab1d3dacc21e9f5c4288972804d.
fix on application controller
Merge branch 'feature-generatorUi' of https://github.com/nicky-isaacs/TerrainGenerator into feature-generatorUi

Conflicts:
	app/controllers/application_controller.rb
forms displaying correctly
Merge branch 'feature-generatorUi' of github.com:nicky-isaacs/TerrainGenerator into feature-generatorUi
semi functioning
change wording
changed variable option for values to be just 'v'
added alert helpers, begin compiling json
controller edits
working on posting json'
Merge remote-tracking branch 'origin/feature-cucumber' into feature-generatorUi
Merge branch 'feature-cucumber' of github.com:nicky-isaacs/TerrainGenerator into feature-generatorUi
Merge branch 'feature-cucumber' of github.com:nicky-isaacs/TerrainGenerator into feature-generatorUi
post to server working, data validations
Merge branch 'feature-cucumber' of github.com:nicky-isaacs/TerrainGenerator into feature-generatorUi