1
git log
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'SWiFTfososc/develop' into develop
Study Nettify very much
rewrite CodingProtocol
Rewrite Coding
Rewrite Coding
:wq
Rewrite: 2
Foutje
Pimp Version History: 1
Merge remote-tracking branch 'mussieFork/develop.rewriteVersionHistory' into develop

Conflicts:
	webApp/swift/project/build/LiftProject.scala
	webApp/swift/src/main/scala/bootstrap/liftweb/Boot.scala
	webApp/swift/version_history.html