feature to merge
should break on merge
compile and logic errors
Merge pull request #5 from bpowell/feature_about

Feature about