Tiny changed.
Merge branch 'master' of github.com:toomore/COSCUP2013Secretary-Toolkit

Conflicts:
	templates/coscup_attendee.htm