Tests written
Merge pull request #3 from zipzaprjr/master

Finished test writing and did minor tasks
Change test
Merge pull request #4 from zipzaprjr/master

Change tests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/education.rb
	app/models/information.rb
Tests passing
Merge pull request #5 from zipzaprjr/master

Further test changes
merge with ron-working