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

merging