First Commit
Test Commit
Merge branch 'master' of github.com:Arucarn/resolution

Conflicts:
	README.md