Change
Merge branch 'master' of https://github.com/douglassboshkoff/PTConnect

Conflicts:
	project_files/model/accounts_db.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	project_files/model/accounts_db.php
Merge remote-tracking branch 'origin/master'
gets college name by user (account) ID
Merge branch 'master' of https://github.com/douglassboshkoff/PTConnect