resolved conflicts and integrated my story
added missing test for answers
migration
sumbit by one button now working
Merge branch 'master' of https://github.com/ndomar/megasoft-13 into c3s8-answer_questionnaire
removed unneeded tests+edited uml
fixed line removed by mistake
answers fields were hidden fixed
non functional part done
finished design + edited uml
fixed indentation
updated with master
redesigned login form
added migration and edited task.rb
removed schema from commit
cleaned tmp
Merge branch 'AddNewAttributesToTask' of https://github.com/ndomar/megasoft-13 into AddNewAttributesToTask
navbar
experimenting carousel
more into design