Merge pull request #12 from diplay/results-dev

Results dev
models, controller changes and new js
s_answer creation
fix bugs
Merge branch 'log' of https://github.com/diplay/Project into alzater

Conflicts:
	app/views/layouts/task.html.erb
	db/schema.rb
Merge branch 'alzater' of github.com:diplay/Project into results-dev
s info in seeds
Merge branch 'alzater' of github.com:diplay/Project into results-dev
result controller done and integrated with app