temp
Merge branch 'master' of github.com:consileonpl/lrtw-hackaton-20410321

Conflicts:
	app/hackaton.rb
removed debug stuff