Styling tweak
Tryouts with ruby
Cleanup
More cleanup
File renamal
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php