first commit after cloning
Not sure what just happeneda

Merge branch 'master' of github.com:sammyamiller/test1

Conflicts:
	README
README file updated 2013-03-30