Merge branch 'develop' of https://github.com/athahar/ScholarMatch into d...

...evelop

Athahar,

Please do a merge again. looks like the push that i did yesterday didn't complete properly. sorry about that.

Vinai