Testing Layout
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app into James_Wang

Conflicts:
	app/.DS_Store
	app/views/.DS_Store
	app/views/index.html.erb
	app/views/layouts/_footer.html.erb
	app/views/layouts/application.html.erb
derp
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app into James_Wang

Conflicts:
	app/views/layouts/application.html.erb

derp
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app into James_Wang

I don't even know what I changed
Update layouts
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app into James_Wang

Conflicts:
	.DS_Store
	app/.DS_Store
	app/views/.DS_Store
Update links in footer
Fixed the doubling issue
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app into James_Wang

Conflicts:
	app/views/layouts/application.html.erb

Fixed doubling issue
Merge branch 'master' into James_Wang

Conflicts:
	app/views/layouts/application.html.erb

Fixed doubling
Fixed doubling issue
Removed index from views
Merge with master