Added a template readme
Slightly cleaner code
Deleted files that I had accidentally added
Resolved merge conflict