Merged simon_dev
Create README.md
Merged simon_dev
Merged simon_dev
Merged simon_dev
Removed .pyc files
Changed TODO notes