Github hates progress.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	AwesomeProject/Assets/AG_Materials/Menu/AG_Options_Slider.tga.meta
	AwesomeProject/Assets/AG_Materials/Menu/AG_Options_SoundMusic.tga.meta
	AwesomeProject/Assets/AG_Materials/Text.meta
	AwesomeProject/Assets/AG_Materials/Text/Circles.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/Hexagons.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/ShapeChangeIncoming.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/Squares.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/TapThisShape.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/Triangles.tga.meta
Text stuff
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	AwesomeProject/Assets/AG_Materials/Menu/AG_Options_Slider.tga.meta
	AwesomeProject/Assets/AG_Materials/Menu/AG_Options_SoundMusic.tga.meta
	AwesomeProject/Assets/AG_Materials/Text.meta
	AwesomeProject/Assets/AG_Materials/Text/Circles.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/Hexagons.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/ShapeChangeIncoming.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/Squares.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/TapThisShape.tga.meta
	AwesomeProject/Assets/AG_Materials/Text/Triangles.tga.meta
Merge branch 'master' of https://github.com/SuperTouchMadnessParty/AwesomeGame

Conflicts:
	AwesomeProject/Assets/AG_Scripts/PlayButton.cs