Changes
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	Gemfile.lock
small changes
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone
Test Controller Ready - File upload working.
minor routes change
Merge pull request #6 from forkbattery/master

Test Results controller ready for Rev 0