Added apt-get install openjdk-7-jdk to travis build
Merge branch 'master' of github.com:andrie/rfordummies

Conflicts:
	.travis.yml