initial commit
fixed merge
fixed merge
Merge branch 'master' of https://bitbucket.org/ieru/gs-scraper

Conflicts:
	src/main/java/ie/cc/uah/scrapergs/App.java
	src/main/java/ie/cc/uah/scrapergs/bdd/ResourceElement.java
	src/main/java/ie/cc/uah/scrapergs/search/CitationsSearch.java
	src/main/java/ie/cc/uah/scrapergs/search/Search.java
	src/main/java/ie/cc/uah/scrapergs/search/VersionsSearch.java
fixed merge
First commit.
First commit
Merge branch 'master' of github.com:jkklapp/gs_parallel_scraping
Readme file modified. Software package included.