README added
README edited
README edited again
README edited again
README file again
README file
README file
Merge branch 'master' of https://github.com/mdibaiee/Bugpedia
Change dir names
Change dir names
Merge branch 'master' of https://github.com/mdibaiee/Bugpedia

Conflicts:
	config.rb
	css/fonts/ionicons.eot
	css/fonts/ionicons.svg
	css/fonts/ionicons.ttf
	css/fonts/ionicons.woff
	css/main.css
	fonts/ionicons.eot
	fonts/ionicons.svg
	fonts/ionicons.ttf
	fonts/ionicons.woff
	sass/main.scss
	scss/main.scss
	styles/fonts/ionicons.eot
	styles/fonts/ionicons.svg
	styles/fonts/ionicons.ttf
	styles/fonts/ionicons.woff
	styles/main.scss
README
README update
Merge pull request #1 from mamal72/master

README!