Merge branch 'master' of https://github.com/japacible/commission-me into wip-commissions
Merge branch 'wip-commissions' of https://github.com/japacible/commission-me into wip-commissions
Update alerts
Make style changes based on code review
Remove masonry
Fix period
Merge branch 'logout'

Conflicts:
	app/assets/stylesheets/style.css
Tried to fix settings page
Added validation of username uniqueness for #171
Second part of #171, making it such that you cannot send a message to yourself
Fix minor indentation
Fixed up old tests, still cannot get new message test to click compose button
Popover / Summary of user's received commissions
Got message spec test working
Merge branch 'master' of https://github.com/japacible/commission-me into msg_tests
Preparing to push spec test branch into master
move read view buttons
add subject caption
fixing styling issues
return compose button to show view
fix styling