Currently working on getting the server turn on/off button to work.
Merge branch 'master' of git://github.com/jessepitel/mobileDrive

Conflicts:
	mobileDrive.xcodeproj/project.pbxproj
Merge branch 'master' of git://github.com/jessepitel/mobileDrive
Merge branch 'master' of git://github.com/klinginE/mobileDrive

Conflicts:
	mobileDrive.xcodeproj/project.pbxproj
	mobileDrive/MobileDriveAppDelegate.h
	mobileDrive/MobileDriveAppDelegate.m
I fixed the duplication of files.plist
I fixed some compiling errors.
Merge remote-tracking branch 'kling/master'
Successfully merged Eric’s code.
Server switch turns server on and off now.
Server is now able to display website dynamically.
Server is now able to allow downloads, and it parses arguments.
Merge branch 'master' of github.com:klinginE/mobileDrive

Conflicts:
	mobileDrive.xcodeproj/project.pbxproj
	mobileDrive/MobileDriveAppDelegate.m
Fixed merging conflict.
Merge branch 'master' of git://github.com/jessepitel/mobileDrive
Finished get JSON.
Really finished json stuff.
Merge remote-tracking branch 'eric/master'
Removed json NSLog from controller.
Rename and created functions were added to the server.
Merge remote-tracking branch 'jesse/master'