finished basic question#index view
merge conflict
more merge problems
added question form partial
merge conflict