grabbed app for the first time
not sure what stuff isn't commited
Apparently some controllers models and views were changed
started individuals model, made some changes to view
Merge remote-tracking branch 'upstream/master'
getting master up to speed
fixed conflicts with upstream in individual model and form
Took out the comments from application.css.scss
Merge pull request #25 from jschiang/master

Added more model stuff to individuals and fixed a css issue with sethu's help