initial commit
Merge branch 'master' of https://github.com/workingtheories/test3

Merging github version wtih local version.