nothing here
added changes on css
show page for Japanese progress made
v.1 of styling
made some changes to try and debug merge request
Merge branch 'master' into css

Conflicts:
	db/japanese.csv
	db/seeds.rb
Merge pull request #12 from theoblivious/css

Css v.1