testing some change
Merge branch 'master' of http://github.com/bronycub/v2

Conflicts:
	quotes.txt
Merge branch 'master' of http://github.com/bronycub/v2

Conflicts:
	quotes.txt