--commit after reting first page with the orange design
Merge branch 'master' of https://github.com/blidet/repoGroup10.git

Conflicts:
	GitHubNavigator/gen/eda397/group10/navigator/R.java