Carbon time from implemented
Merge branch 'master' of https://github.com/StyleASD/team_citadel into deletemessage

Conflicts:
	app/views/user/profile.blade.php
Username reminder updated
fix for username reminder
updated username reminder
adding robustness
Merge branch 'master' into deckComments

Conflicts:
	app/views/decks/show.blade.php