stuff
Merge branch 'master' of github.com:albertmatyi/dictapp2

Conflicts:
	.meteor/.id
	.rhc_app/dictapp2