Trying to resolve a conflict
Merge branch 'master' of git@github.com:khominhvi/MoneyJarWeb.git

Conflicts:
	MoneyJarWeb/.classpath
	MoneyJarWeb/.gitignore
	MoneyJarWeb/.settings/org.eclipse.wst.common.component
	MoneyJarWeb/src/com/moneyjar/statement/CSVParser.java
	MoneyJarWeb/src/com/moneyjarweb/upload/UploadServlet.java