Edited welcome message
Edited welcome message
Merge branch 'CommentFix' of https://github.com/ospreys-2014/Lil-Wayne into CommentFix

Conflicts:
	Mac_Overflow/app/assets/stylesheets/application.css
Merge pull request #15 from ospreys-2014/CommentFix

Comment fix