update favicon
Merge pull request #83 from cameronjacoby/master

update favicon
adds factories for rspec, factory girl gem, ffaker gem
Merge pull request #84 from lisavogtsf/master

adds factories for rspec, factory girl gem, ffaker gem
testing
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin

Conflicts:
	Gemfile