testing font
font test two
new font
new font 2
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp
assets
Merge branch 'master' of https://github.com/bryonfinke/Furnishly_CraigslistApp

Conflicts:
	public/assets/application-33d3840d4a1074d78012d2f5dff9187d.js.gz
	public/assets/application.css.gz
	public/assets/application.js.gz