deleted:    hs_err_pid6268.log
	deleted:    hs_err_pid7320.log
Merge branch 'master' of https://github.com/stefandragosnitu/AngelsVsDemons