tests, bitch
Merge remote-tracking branch 'origin/master' into tuesday-testing
removed a test link from header
Conflicts:
	app/views/layouts/_header.html.erb
removed test link test and added pending route test
Merge pull request #21 from fox-squirrels-2013/tuesday-testing

Tuesday testing