Add simple test file with hard-coded data
Add em value in select and conversion
Merge pull request #27 from laurentperez/master

issue 26 : remove the root / from resources
Merge pull request #12 from garann/master

Test file for things that need testing
Rename confusing var
Add simple test file with hard-coded data
issue 26 : remove the root / from resources
Add em value in select and conversion
Merge master into ft-emvalues
Merge pull request #24 from ResponsiveImagesCG/ft-emvalues

Add em value in select and conversion
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/scripts/main.js
issue #19 : fix button style