installed foundations
removed gemfile.lock
Merge branch 'master' into layout_and_scss

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml
Styling and layout for album views. Styling done for custom box formatting.
More styling done and placeholder images added.
Merge branch 'master' into layout_and_scss

Conflicts:
	app/views/albums/index.html.haml
	app/views/layouts/application.html.haml