My first commit
tired of trying
Resolved first conflict