change URL to my LinkedIn and Github to reflect recent change in username
Merge branch 'development'
Merge branch 'development'
Added development gem called Rail Roady, see /doc folder for .svg graphs
User can now change their profile picture.

Implement profile picture upload functionality with Filepicker. Currently, it's just a basic implementation.
Merge branch 'master' into filepicker
Remove test code that we forgot to take out.
Merge master into development and fix conflicts.

Merge branch 'master' into development

Conflicts:
	app/decorators/user_decorator.rb
	app/views/users/show.html.haml