update git ignore file
Merge branch 'master' of https://github.com/mnipper/rails_survey
render json instead of respond_with when saving question/survey through api
add wysihtml5 editor ... not quite functional
add active admin
merge conflicts
add user projects