basic Term functionality
Fixed typo in post add term to Term
Merge branch 'master' of https://github.com/avondohren/project-git

Conflicts:
	app/main.rb