new branch
clear merge
push
Merge branch 'austin'
Merge branch 'master' of github.com:SUNY-Albany-CCI-INF362/american-football
ugh merge conflicts
Conflicts:
	index.html
	navigation.html