commitiing to start new branch and solve marker issue and other stuff
Merge branch 'master' into kyle
merged with master
merged with master
removed old form fields that are no longer used
merged with master
rolled back changes done to master. merging with master
Merge branch 'kyle'
pushing to remote and to heroku