modfied app.js
Add html styling, this fixes #3
Merge pull request #2 from antonarhipov/master

testing a pull request
Update readme file
Add text to readme
Merge branch 'master' of https://github.com/githubstudent/geekout

Conflicts:
	README.md
A random change of 15522 to more1.txt
A random change of 24082 to more2.txt
A random change of 28486 to more3.txt
A random change of 3065 to extras1.md
A random change of 25585 to extras2.md
Merge branch 'jordan-feature' of https://github.com/githubstudent/geekout into jordan-feature

Conflicts:
	styles.css
A random change of 25758 to hello1.txt
A random change of 25661 to hello2.txt
A random change of 8457 to hello3.txt
A random change of 11349 to hello4.txt
A random change of 18017 to hello5.txt