Feature/merit

functionality is there. Everything works.
Just need to implement exactly what assigns points and how much for each milestone.
Eh? Why is schema.rb back in here? Thought you took this out and ignored it?