Saving changes for merge conflict
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Created compose and tags view
Added some HTMl to the compose page
Merge branch 'master' of github.com:pagekite/Mailpile
Merge branch 'master' of github.com:pagekite/Mailpile
Replaced Museo with Mailpile 300 weight font, updated CSS as per Issue #101
Merge branch 'master' of github.com:pagekite/Mailpile
Added padding and navigation on states to sidebar and sub nav
Moved message HTML and front-end logic out into view.html
Updated webfonts with latest updates
Updated some CSS and HTML for view messages thread
Updated webfont again
Saving codekit config update, updated Mailpile font
Fixed merge conflict and CSS codekit error
Merge branch 'master' of github.com:pagekite/Mailpile
Moved logic from search.html to view.html, made a few sub nav partials, started re-adding contacts HTMLs