!
!
?
Merge branch 'master' of github.com:sensorario/sensorario.github.io

* 'master' of github.com:sensorario/sensorario.github.io:
  Hello world!
  Try to add a php file.
  I am waiting for ideas.
  Created dummy index.html
  Initial commit

Conflicts:
	feed.xml
	index.html