uhhhhhhhhhhhhhhhhhh
merge
update data in template
conflict
Merge pull request #52 from rgschneider/johanna_feature

Johanna feature
real live update for question, help and done is working
Merge pull request #53 from rgschneider/johanna_feature

real live update for question, help and done is working
questions mostly there