Initial commit
Updated README and solved conflict