Merge branch 'aboot_partial'
Merge branch 'master' of https://github.com/nickmeehan/abooty
Merge branch 'master' of https://github.com/nickmeehan/abooty
trying to fix ma shit
Fixed index.erb merge conflict