shortened fw2. Moved exercise figures to app. Added usability def
fixed merge
Merge branch 'master' of https://github.com/mathilwa/Master2013