Working on edit-load and writing RSPEC tests.
added to edit controller
some stuff
Missing template rahhhh
Changed RSPEC tests and added an ape file
file uploading sort of works now
save should be working
Updated test client
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	app/controllers/edit_controller.rb
	app/views/edit/load.html.erb
	config/routes.rb
Merged with master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Merged all code and added more tests
Merge pull request #14 from DownSpiral/master

Server Backend improvements