added back button to origin/new
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of github.com:jamesdabbs/rhok-rails
add width back to order__extra column
Merge branch 'develop'
style devise form
default sort on orders table, and specs
D'oh
fix password labels
Fix(?) send_instructions
add apreset messages to order form
fulfillment_email is an instance method
Merge branch 'master' of github.com:jamesdabbs/rhok-rails
This is why I like static typing
remove some console.logs
add flash notifications
reset order form after submit
adding city to user, omg time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/base/_forms.sass
fix fix fix