Delete .gitignore
Delete test.txt
Add Bootstrap v3.1.1
Update index.html
Update index.html
Update index.html
Update index.html
Update index.html
Update index.html
Update ides.html
Merge branch 'master' of https://github.com/phille97/phille97.github.io

Conflicts:
	index.html
Resolve change conflict
hello
1234123
hello
hello
hai
Merge branch 'master' of https://github.com/phille97/phille97.github.io

Conflicts:
	index.html