fix os status
commit .gitignore
Merge branch 'master' of https://github.com/rabbitpig/blog.git

Conflicts:
	.gitignore
	src/main/java/org/rabbitpig/probe/service/OSService.java
probe.html
merge
Merge branch 'master' of https://github.com/rabbitpig/blog.git

Conflicts:
	pom.xml
	src/main/webapp/probe.html
rm mina