Rearranged some code
Merge branch 'development' of github.com:NeilNjae/cipher-training into development