Merge pull request #1 from rgold1/master

Rebecca's change.
Update README.md
Article stuff
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md
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
Article stuff2
Link temporarily done
Merge pull request #2 from rgold1/master

Article Stuff
Merge remote-tracking branch 'upstream/master'
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"
Added javadocs to Article
Third time's the charm
Third time's the charm + pom.xml fixes
Added skeleton for XmlDump iterator.
Merge pull request #7 from math1man/master

Third time's the charm