try this again
Merge branch 'styling++++++'

Fixing stuff
Adding a bunch of files
Merge pull request #38 from cjord01/polling

fixed the leftside margins because some labels were being cut off
Resolving merge conflict and adding styling
Getting up to date. Merge branch 'master' of https://github.com/cjord01/qaware
Changes schema, beacon has many forms, form belongs to beacon
Merge branch 'schema-beacon-form-update'

Conflicts:
	db/seeds.rb
Adds nested api routing, forms controller, and session controller
select button to form index
Merge pull request #40 from cjord01/clays_branch

select button to form index
Adds api beacons controller, updates api sessions controller and updates routes
Adds employee association to beacon
Changes to return head ok only
Merge pull request #41 from cjord01/api-dynamic

Api dynamic
Adding precompiled assets
Adding updated seed file
css adds
Merge pull request #42 from cjord01/clays_css

css adds
More CSS changes