image updates
ignores
Merge branch 'master' of https://github.com/kernandlead/allonda *resolving merge issues*

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994