Merged calc/format readme into Computer Architecture, add (small) lecture to Software Methodology.