ruby-bbcode added; added report and blog_post methods for html
Merge https://github.com/ulmic/i_am_the_lider into feature
m
added 5 last posts on main
Merge branch 'feature' of https://github.com/ulmic/i_am_the_lider into feature
blog_post added
Merge remote-tracking branch 'origin/feature' into feature

Conflicts:
	app/views/welcome/index.html.haml
done competition
some adds
add render_form
need to commit
some changes
some changes
blog on home page
some adds
Blogs pages added
First production beta
remove bad jpgs
merge commit
remove add_stages initializer