whoooole bunch of stuff

Scholarship
- added TODO (overload toString for printing out scholarship info)
- changed constructor to accommodate creation of Criteria object for a new scholarship (needs Criteria constructor)
- fixed some typos and condensed some code

Admin
- edited/added i/o (edited existing, added for criteria)
- changed call to Scholarship constructor (see Scholarship changes)

Student
- nothing important