merging
Merge pull request #51 from ospreys-2014/front_end

merging