test function added
Merge branch 'master' of github.com:janoskk/twify

Conflicts:
	twify.js