Merge branch 'styleremainder' of github.com:jpatel531/folioapp

Conflicts:
	app/views/organisations/show.html.erb
Did some tidying.
Merge pull request #12 from roidriscoll/master

My changes