2014-12-24 Helen gitignore
2014-12-24 Helen jar
Merge remote-tracking branch 'origin/master'