fixed typo
added build.json
added viewport
Merge remote-tracking branch 'origin/master'
styled inbox
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/sass/_inbox.scss
fixed hover in inbox