Ignore
Merge branch 'master' of https://github.com/jnears/usoc-frontend-library

Conflicts:
	index.html