Added elements
Merge branch 'master' of https://github.com/brightoncollege/Firefly-Data

Conflicts:
	index.html
	styles/style.css