six pm
sixpm db
parser abstract class
log4j setting
Merge branch 'master' of https://github.com/kjkpoi/Crawler_Maven.git

Conflicts:
	Crawler/pom.xml
	Crawler/src/main/java/crawler/shopping/parser/SixPm.java
	Crawler/target/classes/mysql_db_connection.properties