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
added yelp parser back.
added yelp parser back.
fuck this
lol
Merge branch 'master' of https://github.com/dcdrake/cs421_database
Merge branch 'parser'
fixing HelloWorld.java
Populated database, slight edits to parser.
all tables populated.
Delete YelpParser.java
Starting GUI
Merge branch 'master' of https://github.com/dcdrake/cs421_database.git

Conflicts:
	cs421_project/src/cs421_project/YelpParser.java