test commit
Merge branch 'master' into Parker
TempMenu

set up a temporary menu with a few buttons, needs to be re-done.
Demo Commit

just feedback
Committing procedural generation start

starting the building of the world generation scripts
Committing updates

adding saving functionality to cells
adding changes to file saving
committing new change
menu scripts

added an alpha and anchor fade scripts
added title move
Merge branch 'Parker'
Merge branch 'Ryan-Haglund'

Conflicts:
	Assets/NGUI/Examples/Atlases/Wooden/Control - Colored Horizontal
Scroll Bar.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Control - Colored Progress
Bar.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Control - Colored Vertical Scroll
Bar.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Control - Simple Horizontal Scroll
Bar.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Control - Simple Progress
Bar.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Control - Simple Vertical Scroll
Bar.prefab
	Assets/NGUI/Examples/Atlases/Wooden/Control - Simple Vertical
Slider.prefab
	CSE455-Salvage.userprefs
Resize/animation cleanup

All menu items now scale with the size of the screen.  Added a few more
buttons.  Added the New Game 2nd action. Time of slides for some of the
menu buttons needs to be changed.
Added new game function
test commit
Added stuff to Art folder
Merge remote-tracking branch 'origin/Jared-Johnson'
committing changes

unkown
Readme

Readme text
Merge branch 'Jon-Antolin'