added api back in to keep things together
Merge branch 'master' of https://github.com/kbo4sho/graffiti

Conflicts:
	GraffitiApi/App_Start/BundleConfig.cs
	GraffitiApi/App_Start/FilterConfig.cs
	GraffitiApi/App_Start/RouteConfig.cs
	GraffitiApi/App_Start/WebApiConfig.cs
	GraffitiApi/Content/Site.css
	GraffitiApi/Content/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	GraffitiApi/Content/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
	GraffitiApi/Content/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	GraffitiApi/Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
	GraffitiApi/Content/themes/base/images/ui-bg_glass_75_dadada_1x400.png
	GraffitiApi/Content/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	GraffitiApi/Content/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
	GraffitiApi/Content/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	GraffitiApi/Content/themes/base/images/ui-icons_222222_256x240.png
	GraffitiApi/Content/themes/base/images/ui-icons_2e83ff_256x240.png
	GraffitiApi/Content/themes/base/images/ui-icons_454545_256x240.png
	GraffitiApi/Content/themes/base/images/ui-icons_888888_256x240.png
	GraffitiApi/Content/themes/base/images/ui-icons_cd0a0a_256x240.png
	GraffitiApi/Content/themes/base/jquery-ui.css
	GraffitiApi/Content/themes/base/jquery.ui.accordion.css
	GraffitiApi/Content/themes/base/jquery.ui.all.css
	GraffitiApi/Content/themes/base/jquery.ui.autocomplete.css
	GraffitiApi/Content/themes/base/jquery.ui.base.css
	GraffitiApi/Content/themes/base/jquery.ui.button.css
	GraffitiApi/Content/themes/base/jquery.ui.core.css
	GraffitiApi/Content/themes/base/jquery.ui.datepicker.css
	GraffitiApi/Content/themes/base/jquery.ui.dialog.css
	GraffitiApi/Content/themes/base/jquery.ui.progressbar.css
	GraffitiApi/Content/themes/base/jquery.ui.resizable.css
	GraffitiApi/Content/themes/base/jquery.ui.selectable.css
	GraffitiApi/Content/themes/base/jquery.ui.slider.css
	GraffitiApi/Content/themes/base/jquery.ui.tabs.css
	GraffitiApi/Content/themes/base/jquery.ui.theme.css
	GraffitiApi/Content/themes/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_flat_75_ffffff_40x100.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_glass_65_ffffff_1x400.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_glass_75_dadada_1x400.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png
	GraffitiApi/Content/themes/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	GraffitiApi/Content/themes/base/minified/images/ui-icons_222222_256x240.png
	GraffitiApi/Content/themes/base/minified/images/ui-icons_2e83ff_256x240.png
	GraffitiApi/Content/themes/base/minified/images/ui-icons_454545_256x240.png
	GraffitiApi/Content/themes/base/minified/images/ui-icons_888888_256x240.png
	GraffitiApi/Content/themes/base/minified/images/ui-icons_cd0a0a_256x240.png
	GraffitiApi/Content/themes/base/minified/jquery-ui.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.accordion.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.autocomplete.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.button.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.core.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.datepicker.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.dialog.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.progressbar.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.resizable.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.selectable.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.slider.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.tabs.min.css
	GraffitiApi/Content/themes/base/minified/jquery.ui.theme.min.css
	GraffitiApi/Controllers/HomeController.cs
	GraffitiApi/Controllers/Repos/CrewRepository.cs
	GraffitiApi/Controllers/Repos/UserRepository.cs
	GraffitiApi/Controllers/TagController.cs
	GraffitiApi/Dal/GraffitiContext.cs
	GraffitiApi/Global.asax
	GraffitiApi/Global.asax.cs
	GraffitiApi/GraffitiApi.csproj
	GraffitiApi/Images/accent.png
	GraffitiApi/Images/bullet.png
	GraffitiApi/Images/heroAccent.png
	GraffitiApi/Images/orderedList0.png
	GraffitiApi/Images/orderedList1.png
	GraffitiApi/Images/orderedList2.png
	GraffitiApi/Images/orderedList3.png
	GraffitiApi/Images/orderedList4.png
	GraffitiApi/Images/orderedList5.png
	GraffitiApi/Images/orderedList6.png
	GraffitiApi/Images/orderedList7.png
	GraffitiApi/Images/orderedList8.png
	GraffitiApi/Images/orderedList9.png
	GraffitiApi/Models/Abstract/ITagRepository.cs
	GraffitiApi/Properties/AssemblyInfo.cs
	GraffitiApi/Scripts/jquery-1.7.1.js
	GraffitiApi/Scripts/jquery-1.7.1.min.js
	GraffitiApi/Scripts/jquery-ui-1.8.20.js
	GraffitiApi/Scripts/jquery-ui-1.8.20.min.js
	GraffitiApi/Scripts/jquery.unobtrusive-ajax.js
	GraffitiApi/Scripts/jquery.unobtrusive-ajax.min.js
	GraffitiApi/Scripts/jquery.validate-vsdoc.js
	GraffitiApi/Scripts/jquery.validate.js
	GraffitiApi/Scripts/jquery.validate.min.js
	GraffitiApi/Scripts/jquery.validate.unobtrusive.js
	GraffitiApi/Scripts/jquery.validate.unobtrusive.min.js
	GraffitiApi/Scripts/knockout-2.1.0.debug.js
	GraffitiApi/Scripts/knockout-2.1.0.js
	GraffitiApi/Scripts/modernizr-2.5.3.js
	GraffitiApi/Views/Home/Index.cshtml
	GraffitiApi/Views/Shared/Error.cshtml
	GraffitiApi/Views/Shared/_Layout.cshtml
	GraffitiApi/Views/Web.config
	GraffitiApi/Views/_ViewStart.cshtml
	GraffitiApi/Web.Debug.config
	GraffitiApi/Web.Release.config
	GraffitiApi/Web.config
	GraffitiApi/favicon.ico
	GraffitiApi/packages.config
	GraffitiData/Models/Crew.cs