Sprint 2 updates and .gitignore fixes

sprint 2 update