updated sql
Merge pull request #18 from autorepo/development

updated sql
Merge pull request #19 from ytfunpanda/master

testing
more changes
testing 2
Merge pull request #20 from ytfunpanda/development

testing 2
more changes to home
Merge branch 'master' into development

Conflicts:
	src/AutoWeb/Views/Home/Index.cshtml
Merge pull request #21 from autorepo/development

my changes
test change
Merge pull request #22 from autorepo/development

test change
Merge pull request #23 from autorepo/master

testing pull
Merge pull request #24 from autorepo/development

Merge pull request #23 from autorepo/master
test master usage
Merge branch 'master' of https://github.com/autorepo/autolisting

Conflicts:
	src/AutoWeb/Views/Home/Index.cshtml
removed Web.configs
add some margin top so content doesn't appear behind nav bar
Merge branch 'master' of https://github.com/ytfunpanda/autolisting into ytfunpanda-master

Conflicts:
	src/AutoWeb/Views/Home/Index.cshtml
	src/AutoWeb/bin/Auto.Web.dll
	src/AutoWeb/bin/fr/Auto.Web.resources.dll
	src/AutoWeb/bin/zh/Auto.Web.resources.dll
Merge pull request #1 from autorepo/master

update master to latest