initial commint
Merge https://github.com/billott/myapp