Updated .gitigore and merged with master