changed background on style sheets
pre-merge commit
pre merge changes
added a pseudo code file to assist in planning the views
changes made to the layout page and some styling
minor changes to index.html.erb
merged from development