Is this the commit message?
Is this the commit message?
Yes, this is the commit message.  Even though it says "comment"
Okay, I can commit, so let's get rid of that gibberish
Added basic mvn module structure
Initial test
Added jooq dependency
Added h2 dependency
testing
-Ari
Push test
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/pom.xml
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Article.java
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Concept.java
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Link.java
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	wikapidia-core/pom.xml
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Article.java
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Concept.java
	wikapidia-core/src/main/java/org/wikapidia/core/domain/Link.java
Link temporarily done
Concept done for now
pulled Article
made parameter names same as object variable names
Fixed various things you suggested, such as "pageID" changed to "articleId"
Third time's the charm
Third time's the charm + pom.xml fixes
Merge pull request #7 from math1man/master

Third time's the charm