Assets and front end added
assets added
Merge branch 'master' of https://github.com/a34729t/sportshackday2013

Conflicts:
	index.html
Merge branch 'master' of https://github.com/a34729t/sportshackday2013
test

test