Initial commit
Merge branch 'master' of github.com:6170-fa14/ebitonte_rchipman_beckert_proj3

merging eben's repo with the official one