Moar style fixen

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

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Merge branch 'master' of github.com:urfolomeus/edinburgh_stories

Conflicts:
	app/assets/stylesheets/temporary.css.sass
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>
Housekeeping

Signed-off-by: Alan Gardner <alan@armoin.com>
My Memory Page updates

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Merge branch 'master' of https://github.com/urfolomeus/edinburgh_stories

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

Conflicts:
	app/.DS_Store
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>
Basic API around memories

Signed-off-by: Alan Gardner <alan@armoin.com>
Initial adding of JSON functionality

Signed-off-by: Alan Gardner <alan@armoin.com>
Sharing memory partial between collection and resource

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

Signed-off-by: Alan Gardner <alan@armoin.com>
Merge branch 'api' into production