created yelp parser
Merge branch 'master' into parser

Conflicts:
	cs421_project/src/cs421_project/HelloWorld.java
Merge branch 'master' of https://github.com/dcdrake/cs421_database into parser

Conflicts:
	cs421_project/.classpath
	cs421_project/src/cs421_project/HelloWorld.java
Delete YelpParser.java
edited password
Merge branch 'master' of https://github.com/dcdrake/cs421_database.git into parser

Conflicts:
	cs421_project/src/cs421_project/YelpParser.java