Prepare for DOOM!
Merge branch 'master' of github.com:srejv/feelings

Conflicts:
	js/feelings.js
Merge branch 'master' of github.com:srejv/feelings
Prepare for text drops
Merge branch 'master' of github.com:srejv/feelings