finished associations
add OS files to .gitignore
fixing merge conflicts
Merge branch 'master' into basic_views