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
Test results controller
unnecessary files deleted
Merge pull request #8 from forkbattery/master

Re-commit - TR MVC
Merging test results controller
Got pagination working on phonebook
Implemented Pagination and Search feature for phonebook
Merge pull request #10 from forkbattery/master

Implemented pagination and search feature for phonebook
merging in test results