Update README.md
Edited readme for readability, typos, etc.
Merge remote-tracking branch 'gengo/master'

Conflicts:
	README.md
Merge pull request #3 from mromaine/master

Edited readme for readability, typos, etc.
changed radius of large button
Merge pull request #4 from toshipon/master

changed radius of large button
added facebook and google login button
changed modal redius
updated version
Merge pull request #5 from toshipon/master

added facebook and google login button and changed a radius of modal
add .navbar-fixed-right/.navbar-fixed-left class to be able to make fixed content on right or left
remove padding from responsive .navbar-inner
Merge remote-tracking branch 'origin/master' into v2_branch

* origin/master:
  updated version
  changed modal redius
  added facebook and google login button
  changed radius of large button
  Edited readme for readability, typos, etc.
  Update README.md

Conflicts:
	docs/assets/css/jericho.css
	jericho.css
commit jericho.css file