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
cleaned up session controller tests and configured spec helper to include facebook oauth test
added tests for user model, added validations for user, updated tests that depend on user.
Merge pull request #66 from red-admirals-2014/session-tests-dan

cleaned up session controller tests and configured spec helper to includ...
fixing merge conflict in sessions controller spec
two sessions controller tests pending due to new validations on user creation
Fixing controller testing
Merge pull request #67 from red-admirals-2014/amy_testing_wed

Amy testing wed
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
Merge pull request #69 from red-admirals-2014/jasmine_shit

Jasmine shit
Added a black visited link