Merge branch 'master' of https://github.com/QC-Edu/IntroQM

Author: PaulWAyers

book/problems/Final_Project_Ideas.md

@@ -14,11 +14,7 @@
 
 1. ~~Consider a particle in a box with finite, rather than infinite walls. What about the case where two boxes are separated by a barrier?~~ (Project Claimed)
 
-<<<<<<< HEAD
-1. ~~Consider a quartic potential, which is a model for a double-well (a simplified model for a chemical reaction and for electron transfer).~~ (Project Claimed)
-=======
 1. ~~Consider a quartic potential, which is a model for a double-well (a simplified model for a chemical reaction and for electron transfer)~~ (Project Claimed).
->>>>>>> 6edba516141c3c294a62e103256ef01edd9a7137
 
 1. Solve, numerically, the wavefunction for the proton in the malonaldehyde molecule, which is a model for tunelling effects in hydrogen bonding.
 
@@ -32,7 +28,7 @@
 
 1. Computing (homogeneous) spectral broadening due to the finite lifetime of excited states and/or pressure (collisional) effects.
 
-1. Computing (inhomogeneous) spectral broadening due to temperature (thermal) or solvent (spatial inhomogenity) effects.
+1. ~~Computing (inhomogeneous) spectral broadening due to temperature (thermal) or solvent (spatial inhomogenity) effects.~~(Project Claimed)
 
 1. ~~Computation of the rotational spectrum of a polyatomic molecule.~~ (Project Claimed)