.gitignore created by brackets-git extension
Align proj
sistemato chart
Merge remote-tracking branch 'AulApp/master'

Conflicts:
	.gitignore
	README.md
	aule.php
	aule_prenota.php
	condividi.php
	css/bootstrapValidator.min.css
	css/styles.css
	fonts/GauntletClassic_TB.otf
	home.php
	images/logo.png
	img/06_polka-dots.jpg
	img/Background-X-Repeat.jpg
	img/Thumbs.db
	img/abstract-swirls-seamless-pattern-background-vector-hand-drawn-curl-elements-blue-31418529.jpg
	img/back-to-school4.jpg
	img/backgrounds-website-background-blue-blue-1535195838.jpg
	img/blue_square_pattern-t2.jpg
	img/bluured.jpg
	img/cloud_2.gif
	img/default_profile.jpg
	img/dislike.png
	img/glyphicons-211-left-arrow.png
	img/graph.png
	img/icon-select.png
	img/icon-select2.png
	img/like.png
	img/power.png
	img/rainbowflag-1.png
	img/ricalco-circle.png
	img/ricalco.jpg
	img/social-facebook.png
	img/social-google.png
	img/social-twitter.png
	img/user-icon.png
	img/wifi.png
	index.php
	index_old.php
	js/bootstrapValidator.min.js
	php/api.php
	php/prova.php
	profilo.php
	style.css
	styles/styles.css