commit for pulling ming's ticket 110
Merge branch 'master' of github.com:nathanrharris/MyNGL
Merge branch 'master' of github.com:nathanrharris/MyNGL
Merge branch 'master' of github.com:nathanrharris/MyNGL
Merge branch 'master' of github.com:nathanrharris/MyNGL
round of updates from Tuesday the 2nd