schema update with latest chanegs
Merge pull request #4 from DennisMarcu/master

dennis pull request - will need to fix views/phr/show back to h4 headers
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	db/schema.rb
deleting some unessessary view files and fixing phr/show view
Changes
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	Gemfile.lock
removing unessesary files
removing redundant stylesheet
Eye controller done, only testing left. Also updated some UX on various pages
Added paginate for eye#index. Also started adding tests
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