cuxumber set up
merging in to get hold of the sweet HTML page that Matt and Steve made
Merge branch 'master' of github.com:triathlonboy/hawkerboard
first commit
commiting before pulling down
commit before merge
Conflicts:
	views/index.erb
commiting