changes
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' into sophana
placeholder form for login and signup
Merge branch 'master' into kyle