merge commit
Merge branch 'alpha' of https://github.com/ReFuel/ReFuelJS into alpha
media query