Just got done with Part 3 it was so much easier than part 2 thursday night right before PeakChaos
initial heroku commit and trin to finish tonight!
Start of HW5 in CAP"S Thursday during SAAS maybe have part 1 completed
Working through stuff part one completed and first cucumber test done working through second test goin to push...
Merge branch 'master' of https://github.com/UCCS-CS3300-Spring2014/mlockett
idk just fixin
Conflicts:
	HW4/rottenpotatoes/config/application.rb