Merge branch 'development'
Merge branch 'development'
Update README.md
Merge branch 'development'
Merge branch 'master' of github.com:mileszim/horatio
Ready for demonstration today
Update README.md
Update README.md
Merge branch 'master' into development