working unstyled
added css
trying to merge environment
Merge pull request #13 from christianstanfield/aaron

merging all branches