Upload temp files
Merge branch 'master' of https://github.com/ernest21/bilden

Conflicts:
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/0c9f5a68e10c76b2d39acc37bb242e22
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1907f93d97ee08c43c6bb08d3f1429fd
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/328fcb4655e4e10504dfe5f2cd335473
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/3665aa30fefe8e40fe1f86cc5f90de35
	tmp/cache/assets/development/sprockets/46ef378397125ec6711c3a9782ba5ca2
	tmp/cache/assets/development/sprockets/67d5c3a6d210a823303a3ecd24400591
	tmp/cache/assets/development/sprockets/7e4cc41e4f9d0003e850c55981e60cfb
	tmp/cache/assets/development/sprockets/8323acc456adc2c261b76e036885dedc
	tmp/cache/assets/development/sprockets/aff9962a6dc7bb21cfa9c27f549070b1
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655