updated readme
Update README.md
Merge branch 'austin' of https://github.com/psideleau/shu-cs604 into Vinny.local
Merge branch 'austin' of https://github.com/psideleau/shu-cs604 into Vinny.local
add grants
update seed db script
Merge branch 'austin' of https://github.com/psideleau/shu-cs604 into Vinny.local
grant permissions
get line items and unit test
ProgrmaSummariesController.java
new commit
changes
stuff
updated datahandler.java updated programsummariescontroller.java
Merge branch 'fall2013master' of git://github.com/psideleau/shu-cs604 into fall2013master

merge to local
revise getYearPrice()
Update ProgramSummariesController.java
controllers and datahandler
controllers and datahandler
Merge branch 'Vincent' of https://github.com/psideleau/shu-cs604 into Vinny.local