Working on actions and input
Merge branch 'master' of https://github.com/team3499/2014

Merge stuff with stuff.
Forgot to merge, commiting again, then pushing.
Merge branch 'master' of https://github.com/team3499/2014

Mergeing.