deleted:    app/assets/images/.keep
	deleted:    app/assets/images/3.jpg
	deleted:    app/assets/images/4.jpg
	deleted:    app/assets/images/5.jpg
	deleted:    app/assets/images/5.png
	deleted:    app/assets/images/65.jpg
	deleted:    app/assets/images/at1.jpg
	deleted:    app/assets/images/at2.jpg
	deleted:    app/assets/images/at3.jpg
	deleted:    app/assets/images/at4.jpg
	deleted:    app/assets/images/at5.jpg
	deleted:    app/assets/images/at6.jpg
	deleted:    app/assets/images/cap.jpg
	deleted:    app/assets/images/cc.jpg
	deleted:    app/assets/images/ceo.jpg
	deleted:    app/assets/images/developer.jpg
	deleted:    app/assets/images/f3.jpg
	deleted:    app/assets/images/favicon.ico
	deleted:    app/assets/images/fb.jpg
	deleted:    app/assets/images/item.jpg
	deleted:    app/assets/images/logo.png
	deleted:    app/assets/images/logo_100.png
	deleted:    app/assets/images/logo_75.png
	deleted:    app/assets/images/logo_75_o.png
	deleted:    app/assets/images/mac.jpg
	deleted:    app/assets/images/network_monitor.jpg
	deleted:    app/assets/images/no_image.png
	deleted:    app/assets/images/ny.jpg
	deleted:    app/assets/images/old-bg.jpg
	deleted:    app/assets/images/oldth2.jpg
	deleted:    app/assets/images/p1.jpg
	deleted:    app/assets/images/p10.jpg
	deleted:    app/assets/images/p2.jpg
	deleted:    app/assets/images/p3.jpg
	deleted:    app/assets/images/p4.jpg
	deleted:    app/assets/images/p5.jpg
	deleted:    app/assets/images/p6.jpg
	deleted:    app/assets/images/p7.jpg
	deleted:    app/assets/images/p8.jpg
	deleted:    app/assets/images/p9.jpg
	deleted:    app/assets/images/post.jpg
	deleted:    app/assets/images/post2.jpg
	deleted:    app/assets/images/post3.jpg
	deleted:    app/assets/images/post4.jpg
	deleted:    app/assets/images/post5.jpg
	deleted:    app/assets/images/rb.jpg
	deleted:    app/assets/images/software-dev.jpg
	deleted:    app/assets/images/t1.jpg
	deleted:    app/assets/images/t2.jpg
	deleted:    app/assets/images/t3.jpg
	deleted:    app/assets/images/team.jpg
	deleted:    app/assets/images/th1.jpg
	deleted:    app/assets/images/th2.jpg
	deleted:    app/assets/images/th3.jpg
	deleted:    app/assets/images/vista.png
	deleted:    app/assets/images/w1.jpg
	deleted:    app/assets/images/w2.jpg
	deleted:    app/assets/images/w3.jpg
	deleted:    app/assets/images/w4.jpg
	deleted:    app/assets/javascripts/application.js
	deleted:    app/assets/javascripts/blog.js.coffee
	deleted:    app/assets/javascripts/categories.js.coffee
	deleted:    app/assets/javascripts/clients.js.coffee
	deleted:    app/assets/javascripts/messages.js.coffee
	deleted:    app/assets/javascripts/notes.js.coffee
	deleted:    app/assets/javascripts/posts.js.coffee
	deleted:    app/assets/javascripts/rate_types.js.coffee
	deleted:    app/assets/javascripts/services.js
	deleted:    app/assets/javascripts/welcome.js.coffee
	deleted:    app/assets/stylesheets/application.css.scss
	deleted:    app/assets/stylesheets/notes.css.scss
	deleted:    app/assets/stylesheets/overrides.css.scss
	deleted:    app/assets/stylesheets/scaffolds.css.scss
	deleted:    app/assets/stylesheets/welcome.css.scss
Merge remote-tracking branch 'upstream/master'