updating with master for deployment
updating and merge conflict
adding product page
removed product
src
catching up from Yo build
clean up
Merge branch 'development' of https://github.com/CrossTrack/crosstrackapp into development
Ready for release
begin release
Release 0.1.0
resolved merge conflicts
merge release
merge conflicts resolved