Feedback (#11)
Feedback (#11)

* workflows and tools

* Proven concepts

* feature branch workflow

* merge hell

* wip

* merge hell

* updates from the feedback round

chriwu/ps-tec-2017,chriwu/ps-tec-2017,chriwu/ps-tec-2017