Resolve conflicts w/ Rick
Merge branch 'develop'
Add stuff to git ignore