first commit
Merge branch 'master' of http://github.com/jon-schiller/ex1