added .gitignore
Merge branch 'master' of https://github.com/akshaykarnawat/ToraCon

Conflicts:
	bin/org/toracon/dao/impl/AttendeeDaoImpl.class
	bin/org/toracon/dao/impl/EventDaoImpl.class
	bin/org/toracon/main/ToraCon.class
	bin/org/toracon/model/Attendee.class
	bin/org/toracon/model/Event.class
	bin/org/toracon/model/Location.class
	bin/org/toracon/model/Panel.class
	bin/org/toracon/model/Shift.class
	bin/org/toracon/model/Vendor.class
	bin/org/toracon/model/Worker.class
	bin/org/toracon/service/AttendeeService.class
	bin/org/toracon/service/EventService.class