Reverting changes until I beta test more
Merge branch 'gh-pages' of https://github.com/boss-developers/boss-fallout-new-vegas into gh-pages

Conflicts:
	masterlist.yaml