Initial commit
Pulled down github remote and resolved merge conflicts in README.md