rzeczy
Merge branch 'master' of https://github.com/gibu/hackDay2013

Conflicts:
	app.js
sasasa
Merge branch 'master' of https://github.com/gibu/hackDay2013

Conflicts:
	app/view/Main.js
tple
Merge branch 'master' of https://github.com/gibu/hackDay2013