js file?
Merge remote-tracking branch 'origin/nathanMasterCopy'

Conflicts:
	csce361project1145.v12.suo
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache