modified for profile page
Merge branch 'develop' of https://github.com/athahar/ScholarMatch into develop

Conflicts:
	models/schemas.js
modified for profile page
test, adding new favicon and 3 images
Merge pull request #14 from bramwell2010/develop

test - 3 images and 2 favicons
Merge branch 'develop' of https://github.com/athahar/ScholarMatch into develop

Conflicts:
	controllers/profile/index.js
	lib/user.js
updated for profile page
Merge branch 'develop' of https://github.com/athahar/ScholarMatch into develop
Header, new home page, more css, footer
modified for profile page
Merge pull request #15 from vinaiarun/develop

Develop
optimized js, hyphened css, basic css for main pages
Merge pull request #16 from bramwell2010/develop

Header, new home page, more css, footer
fixing csrf issue & added more links in admin console
updated for profile page
modified for profile page
updated for profile page
Merge pull request #17 from vinaiarun/develop

Develop
updated meetings object in schema & added csrf in login of homepage
login on home page enabled, loggedin user will not see login form on home page