trial addition
Merge branch 'trial_branch'
Merge branch 'b1'
Merge uploads to master
Merge branch 'master' into b1
aw yeah
aw yeah
Merge branch 'b1'

Conflicts:
	app/actions.rb
Updated gitignore to include db.sqlite3,uploads
Delete db.sqlite3
Booha
Merge branch 'master' of https://github.com/kkwoker/creep
gitignore
asdfsd