Drag and Drop that bitch up.
Merge branch 'master' of github.com:srejv/feelings

Conflicts:
	js/feelings.js