final changes for res!
Merge branch 'master' of https://github.com/smschrader/fmrhackathon
Merge branch 'master' of https://github.com/smschrader/fmrhackathon