closes #14
Merge branch 'dev' of github.com:harekaplan/intRo into dev