added jquery
Merge branch 'master' of https://github.com/paazby/ice-client

Conflicts:
	package.json
started pulling in matches data from the server
Merge pull request #11 from albreyb/master

Male/Female Images Added to ClientSide
took out api key from files
asdfsdf
Merge branch 'master' of https://github.com/paazby/ice-client

Conflicts:
	package.json
	www/js/app.js
	www/js/controllers/PotentialMatchesCtrl.js
	www/js/controllers/SignInCtrl.js
	www/js/services/matchLoader.js
loading up pictures of george and scarlet
Merge pull request #12 from paulyi326/master

pics of george and scarlett
changes made
fixed merge conflicts
code clean-up, readMe added