ok i took notes
Merge branch 'master' of github.com:xjackk/VirginiaTech