Merge branch 'master' of https://github.com/hlm2/AWAD-Team-Assignment

Conflicts:
	config/libraryloans.txt
	config/parser.rb
hopeful postgresql