Update laptop
Merge branch 'master' of https://github.com/OCAlpha/website

Conflicts:
	app/models/account.rb