Angular folder added.
Angular folder added.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DirectoryBrowser.v11.suo
	DirectoryBrowser/Controllers/HomeController.cs
	DirectoryBrowser/Web.config
	DirectoryBrowser/bin/DirectoryBrowser.dll
	DirectoryBrowser/bin/DirectoryBrowser.pdb
	DirectoryBrowser/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	DirectoryBrowser/obj/Debug/DirectoryBrowser.csproj.FileListAbsolute.txt
	DirectoryBrowser/obj/Debug/DirectoryBrowser.csprojResolveAssemblyReference.cache
	DirectoryBrowser/obj/Debug/DirectoryBrowser.dll
	DirectoryBrowser/obj/Debug/DirectoryBrowser.pdb
removing packages, should be handled via NuGet
removing packages
fix merge conflicts
Overhauled this entire thing because I am awesome. You are welcome.
Merge pull request #13 from alexhoneygosky/master

Overhauled this entire thing because I am awesome. You are welcome.