almost done feeding up markup
Merge branch 'dev' of github.com:winnlab/Agusha into dev
feeding_up contents