fade in
Merge branch 'master', remote-tracking branch 'origin' into michael
text, starting form
added my own branch
Merge branch 'master', remote-tracking branch 'origin'
added twilio script
Merge branches 'michael' and 'azam' into michael
Merge branches 'michael' and 'azam'
Merge branch 'michael' of https://github.com/AzamAbdul/CCMUSIC into michael

Conflicts:
	index.html
php stuff
included twilio library
Merge branch 'michael' of https://github.com/AzamAbdul/CCMUSIC
added backend
deleted
Merge branch 'azam'
added backend
Merge branch 'azam'

Conflicts:
	backend.php

changed