merge changes
Merge branch 'master' of github.com:patnatha/paper_rip