dev log changes
Merge branch 'master' into john
add a little  styling to profile page, still not good
merge master
log changes
merge master
error message in red, erased non functioning tag link
merge master
Merge pull request #55 from woolly-bear-caterpillars-2014/john

John
merge upstream master