Fixing the name of the application
Adding angular js and css for a working navigation bar
Google map
contactpage1
changed contact page to gymlocation.html
Merge pull request #16 from ewamarciniak/Ewas_work

Fixing the name of the application
Merge pull request #17 from ewamarciniak/jourz

From Jourz
Initial statistics page commit
Moving javascript to a separate file. Canvas charts feature
Merge branch 'canvas_charts' of https://github.com/ewamarciniak/advanced_rich_internet_applications into canvas_charts

Conflicts:
	index.html