Made assignments
Merge branch 'master' of github.com:mackorone/two