Changes made by Iskra Popova (iskra_i_popova@mail.bg).
Changes made by Iskra Popova (iskra_i_popova@mail.bg).
Merge branch 'master' of https://github.com/Siko91/Web-Clould--FpsRadar.git

Conflicts:
	FPS Radar/index.html
Changes made by Iskra Popova (iskra_i_popova@mail.bg).
Merge branch 'master' of https://github.com/Siko91/Web-Clould--FpsRadar.git
Changes made by Iskra Popova (iskra_i_popova@mail.bg).