Adding sendgrid for email
Merge branch 'master' of https://github.com/arlton/mxf2014
Wtf
Merge branch 'master' of https://github.com/arlton/mxf2014

Conflicts:
	public/assets/css/style.css
Merge branch 'master' of https://github.com/arlton/mxf2014

Conflicts:
	public/assets/css/style.css
Bug fixes. Added cart object.