whyyyy
whyyyyyyyy
Resolving merge conflicts
Merge branch 'master' of https://github.com/danamc16/randombeyonce

Conflicts:
	views/index.erb
Merge branch 'master' of https://github.com/danamc16/randombeyonce
Still working on that randombeyonce.rb