added text to awesome_page
added text to awesome_page
merged 2 conflicting branches