Removed the socket.io.js folder from vendor assets because we are no longer using web sockets
Combined the google fonts to one @import to help page speed
Removed server...
Merging testing branch with origin.

Merge branch 'master' into tommy_testing_controllers
Removed faulty file name. Starting to test the votes controller
Fixed css styling for iphone
Working on rspec testing for controller
Fixing controller testing
merge conflict with amy's branch
Merged all rspec tests
Refactoring and merging tests
Merge pull request #68 from red-admirals-2014/tommy_testing_controllers

Tommy testing controllers