super fix
Merge branch 'master' into cosimo
Merge branch 'cosimo' of https://github.com/ktk10191/project3-happy-hour into cosimo
photo upload
work on paperclip
work on paperclip
work on paperclip
commit to pull
add user controller test for GET #index
Merge branch 'master' into testing
business controller spec GET #index
test: index should retrun object
fixing for pull
Merge branch 'sophana' of https://github.com/ktk10191/project3-happy-hour into sophana
test: renders index template
remove white border from navbar
Merge branch 'sophana' of https://github.com/ktk10191/project3-happy-hour into sophana
Merge branch 'sophana' of https://github.com/ktk10191/project3-happy-hour into sophana
pulled latest version
commitiing to start new branch and solve marker issue and other stuff