Merging query 12 with time period
Added big red button
Little
Merge branch 'RedButton'

Conflicts:
	group1-sprint2/src/main/webapp/index.html
	group1-sprint2/src/main/webapp/js/main.js