.
Merge pull request #7 from jsuich/development

Development
more styles and controller logic
index.erb merge conflict fix