Fixed race condition bug
Merge pull request #127 from b2coutts/master

Fixed race condition bug
Beginnings of frontend Angular code
Merge git://github.com/cs136/seashell
Merge remote-tracking branch 'kpalway/master'