starting to set up markitup
tiny add to app.css
Merge branch 'master' of github.com:andrewhl/AdvancedStudyRoom into features/markitup
clearing attempt so I can try the gem
working on gem setup
setting up markitup
adding a bit to posts crud
writing probably bs bbcode to html converter
added rdiscount for markdown parsing
update post helper to use rediscount
whaaazuuu??
updating app css and js files for markdown formatter
added posts permissions and sidebar links for admin
Merge branch 'features/markitup'
disabling delete event button
adding new post button
Merge branch 'master' into develop

Conflicts:
	Gemfile