init
Merge branch 'viewupdate'

Conflicts:
	log/development.log
added css shadow
compiling assets