Answer model added

Answer model added
Added question model

added question model
Merge branch 'master' of https://github.com/erboyle/snapp into erboyle-master

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/lnolson/snapp

Conflicts:
	Gemfile