First commit, cleaned up starter prototype
Fixed README and .gitignore conflicts