added basic todo comments
added command line interface and basic file input
Merge branch 'develop'