don't use
Revert "pages work"

Conflicts:
	app/views/pages/lamp.html.erb
	app/views/pages/landing.html.erb
Merge branch 'master' of https://github.com/tedzingrebe/portfolio

This reverts commit 43a23684adc7880f56a543d71c483c42686ce920.

Conflicts:
	app/views/pages/lamp.html.erb
	app/views/pages/landing.html.erb