updated gitignore
pre-merge commit, before merge out to a css feature branch
ammended css for show.html.erb and removed scaffold styling file
Merge branch 'development' of github.com:madness7/GA-Dating-Site into development
merge conflicts sorted