Added glass
Pulled

Merge branch 'master' of https://github.com/taylor1791/gatech-assign2
Added glass