editing aws default url
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
tabs added to meals show
BUG FIX: fixed where creating new meal errored out because it had no ratings
think i fixed merge conflict in user show page but the formatting is dicey now that all the templates have been pulled in
edit for conflict
editing users show for conflict
minor changes is app html
updated for voting css
use seed file with own files, fix last sunday method in company class
Merge branch 'development' into voting_css
fix merge conflict
css fix for user profile default photo problem
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development