merge
Merge branch 'master' of https://github.com/bronycub/v2
Merge branch 'master' of https://github.com/bronycub/v2
Merge branch 'master' of https://github.com/bronycub/v2

Conflicts:
	footer.txt