Updated profile
Merge branch 'master' into justin

Conflicts:
	app/views/Users/index.blade.php
Merge pull request #59 from areveal/justin

Justin