Add tmp file
Remove unused methods
Update user and session
Update style
Adding Header to layout
Update controller
fix user form
Update gitignore
tmp file
Add models for career and subject
junk file
junk file
Merge branch 'master' of github.com:ernest21/bilden

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/0b2c87cab1d091d9675fd1c30e80682e
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/981a4de85ec24bf655c43b980ee742e0
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/e310326f28f946f25a047b53fdd532c8
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655