added expansion options; rewrote MarvelCtrl almost entirely to be more generic
added .gitignore; removed .idea/workspace.xml