Default project with registration, welcome, and about pages added
Merge branch 'master' of github.com:Logangster/horrible-film

Conflicts:
	.gitignore
changed gemfile to add pg for production
Added friendly routes for usernames/profiles
changed links to also use lowercase for usernames
Fixed to_param in user model
fixed actions in users controller to find by username
refactored edit and display users code and added more rspec tests
added avatars for users
removed minimagick
ran bundle to fix gemfile
added cache dir to avatar uploader for heroku
added remember_token to user model attr_accessible
re added routes to go to users from root of site
removed tmp avatars from git repo
changed users new view to say registration
made changes to about content and styles in custom.scss.css
refactored code, added fog gem, set up user avatar uploads to go to google cloud storage
added default url to avatar uploader
updated gitignore to ignore hidden files/directories