updates after 2014-11-25 session
gitignore updated