Working to merge new and old
Merge branch 'CombinationTime'

Conflicts:
	css/design.css
	less/design.less