WTF is happening?
Merge branch 'master' of https://github.com/hackerjimbo/Testing

Conflicts:
	added