ehhhh
Merge branch 'master' of github.com:/corcra/wtf

Conflicts:
	wtf_fns_ok.r