Design Changes and adding to pages

Contact page redesigned
About page redesigned
Added tshirts and sweaters to merch
Changed design of the default panels
Merge branch 'master' of https://github.com/CSSMcMaster/csswebsite

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/3e55bd2c9164a7df8a76843cba916091
	tmp/cache/assets/development/sprockets/b3e30b6dfd69df6d333f9707a6407c80
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/debf0724eb4fd8212ea4f154997dc909
	tmp/cache/assets/development/sprockets/e9086e32311c1697bfc6ecb063f2a1d5
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid