add colors and edit partial files
remove extraneous data from index.erb
fixed merge conflict
Merge pull request #27 from avifoxi/css/design

Css/design