fixing thing
adding stuff that didn't get added
Merge pull request #46 from SUNY-Albany-CCI-INF362/alp

adding a bunch of crud
Merge pull request #47 from SUNY-Albany-CCI-INF362/master

merge all the things!