asdf
asdf
asdf
finished all basic templates
asdf
asdf
Merge pull request #11 from stuycs-softdev/Timothy

Timothy