Merge branch 'master' of https://github.com/scela/bapc2014.git

Conflicts:
	bapc2013/D.in
	bapc2013/src/bapc2013/D.java