Merge pull request #15 from fiery-skippers-2014/styling_round1

Styling round1
some controller testing all tests pass
Merge pull request #16 from fiery-skippers-2014/testing

some controller testing all tests pass
final pre-presentation styling
Merge branch 'master' of https://github.com/fiery-skippers-2014/ras into styling_round1