Upload template struct for parsing usage
Merge branch 'master' of github.com:IcyInsanities/CS101B
Merge changes, cleanup extra files