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>