Merge pull request #19 from justinliucs/master

Merge from base project.
gitignore added.
Merge pull request #40 from lostcharlie/master

gitignore added.