Let's hope this fixes things
Let's hope this fixes things
Merge pull request #16 from math1man/master

LinkDao
Updated LinkDao
Merge pull request #17 from rgold1/master

ConceptDao and ArticleDao
Updated LinkDao
Merge pull request #18 from math1man/master

LinkDao updated
Fixed datasource and connection issues
Fixed datasource and connection issues
Constructors no longer throw exceptions
import java.sql.Connection;
Merge branch 'master' of https://github.com/math1man/wikapidia

Conflicts:
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ArticleDao.java
	wikapidia-core/src/main/java/org/wikapidia/core/dao/ConceptDao.java