Commented out some unnecessary subject model code
merge
Updated gitignore