Glossary

Glossary page 2.0 now made for mobile/pc…just making finishing touches
linking between resources and nav

fixing nav linking with resources
top link

top link now fixed at bottom of page .. doesn't cover summons anymore
create link between about and nav

nav and about us page linked
create link between forms and nav

create link between forms and nag / create new button on nav
Add nav to Resources

Add nav to Resources…can't seem to float it tho
add link from nav to timeline

nav and timeline linked
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
Merge pull request #67 from SUNY-Albany-CCI-INF362/master

merge back
added extra nav buttons, initial work to #10
Merge pull request #68 from SUNY-Albany-CCI-INF362/austin

to close #10, got major nav elements working
Merge pull request #69 from SUNY-Albany-CCI-INF362/master

update pages with most recent master