compile error #1
Compile error #2.

First one use find to find the file. This one use grep -rin to find proper method name
Logic errors

First one is the css active not being applied to admin page when it is active. second
is GET method set to POST
this will be broken in problem1 branch
better focred conflict
Merge branch 'compile_error'
Merge branch 'logic_error'
fixed stupid
code user needs to add to create conflict
new master
fixed stupid again
fixed stupid again
Merge pull request #4 from bpowell/master

problems