added urls to sidebar links
Merge branch 'display_run' of https://github.com/bradpsheehan/feed_engine into dynamic_header
made sidebar image show current user's photo and added photo method to user model
added optional size parameter to user.photo
changed erb file to haml