Merge branch 'development'
Merging development with master
Merge branch 'master' of github.com:antonva/late-term-assignment
getting most recent changes