Migration for choices created.
Create survey working. Rewrote create method in model.
Merge pull request #5 from golden-bears-2014/Michael_Germain

Michael germain
merged from master andresolved conflicts