Merge Both Branches of Code

May be some minor issues with the db password, conflicting with my local machine that may have been overlooked.