asdf
not sure if works
Merge branch 'Timothy'
asdf
asdf
asdf
asdf
asdf
asdf
asdf
finished all basic templates
asdf
asdf
Merge pull request #11 from stuycs-softdev/Timothy

Timothy
templates, parts not done
asdf
Merge pull request #12 from stuycs-softdev/Timothy

Timothy
asdf
asdf
asdf