Converting from HAML to ERB

Signed-off-by: Alan Gardner <alan@armoin.com>

Missed a few

Removing HAML altogether

Signed-off-by: Alan Gardner <alan@armoin.com>

Conflicts:
	app/views/layouts/application.html.haml
	app/views/memories/index.html.haml
	app/views/memories/show.html.haml
	app/views/my/memories/show.html.haml
Fixing some merge issues

Signed-off-by: Alan Gardner <alan@armoin.com>
Updating dependencies

Signed-off-by: Alan Gardner <alan@armoin.com>
Fixing Capybara middleware issue

Signed-off-by: Alan Gardner <alan@armoin.com>
Initial styles
backgrounds and seach bar styles

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Some style fixes

Signed-off-by: Alan Gardner <alan@armoin.com>
Converting from HAML to ERB

Signed-off-by: Alan Gardner <alan@armoin.com>

Missed a few

Removing HAML altogether

Signed-off-by: Alan Gardner <alan@armoin.com>
Home Page Layout update

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
My Memory Page updates

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Housekeeping

Signed-off-by: Alan Gardner <alan@armoin.com>
Temporary spec fixen

Signed-off-by: Alan Gardner <alan@armoin.com>
Fixing background image issue on remote servers

Signed-off-by: Alan Gardner <alan@armoin.com>
Working masonry

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
work on masonry

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
masonry styling

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Sign in / Sign Up styles

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
layout issues on search bar

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Masonry on browse page & some styling

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Few style updates

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>