asdfasdf
Merge branch 'master' of github.com:BrooksPatton/refactoru-gold-rush

Conflicts:
	js/main.js