committing local changes
fixing merge conflict for 37Signals
add images