re-added the basic layout structure and added some deadlinks
Added logo image
custom css
added 'customize' stylesheet
Styling changes
Added layout_links spec
changes to layout links and routes, as well as cosmetic fixes
added Users controller
yay
yay
fixing shit
merging the up to date files
Merge branch 'master' into layout
merging layout to master
Merge branch 'master' into layout

Conflicts:
	.idea/workspace.xml
a
merging
before merge