Added lolilol
Added prout
Merge branch 'mergefail'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/Bradshaw/TheBridge