#15 Started explaining stuff in modals! MODALS!
Merge branch 'master' into gh-pages