Contact markup
Updating SVG marks to finals
Transparent bg favicon
Making version appropriate for beta - 0.5
Adding .webconfig and .htaccess for symbol fonts
Calling from repo for symbol font
One last commit before merge
Merge branch 'master' of https://github.com/jeremyBass/WSU-spine

Conflicts:
	Gruntfile.js
	build/0.5/fonts/OpenSans-Bold.ttf
	build/0.5/fonts/OpenSans-BoldItalic.ttf
	build/0.5/fonts/OpenSans-CondBold.ttf
	build/0.5/fonts/OpenSans-CondLight.ttf
	build/0.5/fonts/OpenSans-CondLightItalic.ttf
	build/0.5/fonts/OpenSans-ExtraBold.ttf
	build/0.5/fonts/OpenSans-ExtraBoldItalic.ttf
	build/0.5/fonts/OpenSans-Italic.ttf
	build/0.5/fonts/OpenSans-Light.ttf
	build/0.5/fonts/OpenSans-LightItalic.ttf
	build/0.5/fonts/OpenSans-Regular.ttf
	build/0.5/fonts/OpenSans-Semibold.ttf
	build/0.5/fonts/OpenSans-SemiboldItalic.ttf
	build/0.5/html/upcms.html
	build/0.5/icons/home-crimson-darker.svg
	build/0.5/icons/home-crimson-darkest.svg
	build/0.5/icons/home-crimson.svg
	build/0.5/icons/home-gray-darker.svg
	build/0.5/icons/home-gray-darkest.svg
	build/0.5/icons/home-gray-lighter.svg
	build/0.5/icons/home-gray-lightest.svg
	build/0.5/icons/home-gray-small.svg
	build/0.5/icons/home-gray.svg
	build/0.5/icons/home-white.svg
	build/0.5/icons/menu.svg
	build/0.5/icons/wsu-icons-regular.eot
	build/0.5/icons/wsu-icons-regular.otf
	build/0.5/icons/wsu-icons-regular.svg
	build/0.5/icons/wsu-icons-regular.ttf
	build/0.5/icons/wsu-icons-regular.woff
	build/0.5/images/favicon.ico
	build/0.5/images/gradient-south-lightest-white.png
	build/0.5/images/gradient.png
	build/0.5/scripts/spine.js
	build/0.5/styles/colors.css
	build/0.5/styles/jqueryui.css
	build/0.5/styles/opensans.css
	build/0.5/styles/respond.css
	build/0.5/styles/skeleton.css
	build/0.5/styles/spine.css
	build/0.5/styles/styles.css
	build/authors.txt
	build/favicon.ico
	build/spine.css
	build/spine.js
	build/spine.min.css
	build/spine.min.html
	build/spine.min.js
	marks/sig-h-extension.svg
	marks/sig-h-globalcampus.svg
	marks/sig-h-spokane.svg
	marks/sig-h-tricities.svg
	marks/sig-h-vancouver.svg
	marks/sig-horizontal-whitelogotype-darkerchevron.svg
	marks/sig-horizontal-whitelogotype.svg
	marks/sig-horizontal.svg
	marks/sig-v-extension.svg
	marks/sig-v-globalcampus.svg
	marks/sig-v-spokane.svg
	marks/sig-v-tricities.svg
	marks/sig-v-vancouver.svg
	marks/sig-vertical-blacklogotype.svg
	marks/sig-vertical-darkestlogotype.svg
	marks/sig-vertical-white-darkercrimsonchevron.svg
	marks/sig-vertical-white-darkestcrimsonchevron.svg
	marks/sig-vertical-white.svg
	marks/sig-vertical-whitelogotype-blackchevron.svg
	marks/sig-vertical-whitelogotype-darkchevron.svg
	marks/sig-vertical-whitelogotype-darkerchevron.svg
	marks/sig-vertical-whitelogotype-darkestchevron.svg
	marks/sig-vertical-whitelogotype-graychevron.svg
	marks/sig-vertical-whitelogotype-lightchevron.svg
	marks/sig-vertical-whitelogotype-lighterchevron.svg
	marks/sig-vertical-whitelogotype.svg
	marks/sig-vertical.svg
	marks/sig.svg
	scripts/spine.js
	test/test.html
New Gruntfile
Fixing spine.js Merge Fail