Initial commit
Merge branch 'master' of https://github.com/rosstex/proj1

Conflicts:
	README.md