#41
closes #42
Committing for backup
Closes #41
Merge branch 'master' into abstraction
#41 Made everything compile. ready for testing
Deleted unused classes
#44 Committing for backup
fixed merge conflicts
#41 fixed a  minor bug
#41 clean up fix
Merge branch 'master' into abstraction
#39
#39
fixed merge conflicts
Removed cached and updated gitignore
Merge branch 'master' into abstraction
fixes and closes #44
Committing for backup #54