Merge pull request #10 from fiery-skippers-2014/dev

Dev
Merge pull request #11 from fiery-skippers-2014/dev

working on being able to fill out survey
working on survey
working on survey
Merge branch 'master' into dev