new error functions, user id top right, minor css & logo change
Modified for signup email
Merge branch 'develop' of https://github.com/athahar/ScholarMatch into develop
minor updates
Merge pull request #25 from bramwell2010/develop

new error functions, user id top right, minor css & logo change
New css, updated footer, base page css done, testimonials section
Merge branch 'develop' of https://github.com/athahar/ScholarMatch into develop

Conflicts:
	public/templates/signup/index.dust
Merge pull request #26 from vinaiarun/develop

Develop
Merge pull request #18 from mevashi/develop

Meeting notes changes
form alignments, fixed css & header -loggedin user name
fixed issues
Merge pull request #28 from bramwell2010/develop

New css, updated footer, base page css done, testimonials section
email content added for welcome & match, minor css to fix div floating header bug
Merge pull request #32 from bramwell2010/develop

email content added for welcome & match, minor css to fix div floating h...
implementation of chosen library in meetinginvite
Merge branch 'develop' of github.com:athahar/ScholarMatch into develop
modified to list only unmatched coaches when clicked list all coaches link
modified to display only the unmatched coaches from all other coach search links
Merge pull request #34 from vinaiarun/develop

modified to list only unmatched coaches when clicked list all coaches li...
Modified to have a pull down select box for the industry in the search coach page and list the coaches matched for the selected industry in the search results page