leaving work, committing changes so I can work on them from home.
Merge remote-tracking branch 'origin/primary-development' into primary-development
style changes, trying to fix a bug with welcome message. and failing
style fixes and improvements.
Merge pull request #8 from defenestrator/primary-development

style fixes