Removed bad patch info from file
Merge branch 'master' of https://github.com/zeryl/bah into zeryl-master
Merge branch 'zeryl-master'
MMergeerge branch 'master' of ssh://github.com/billkramme/bah

Conflicts:
	functions.py